Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #35721 #35717 #35804

Merged
merged 2 commits into from
Oct 28, 2016
Merged

Automated cherry pick of #35721 #35717 #35804

merged 2 commits into from
Oct 28, 2016

Conversation

jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Oct 28, 2016 •
edited by k8s-oncall

Cherry pick of #35721 #35717 on release-1.4.
#35721: Fixes PR #35652
#35717: update rkt to v1.18.0 which avoids outputting debug

This change is Reviewable

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@jessfraz jessfraz added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed cla: no labels Oct 28, 2016
@jessfraz jessfraz added this to the v1.4 milestone Oct 28, 2016
@jessfraz jessfraz self-assigned this Oct 28, 2016
@vishh @jessfraz
update rkt to v1.18.0 which avoids outputting debug information by de…
766e995 
…fault

Signed-off-by: Vishnu kannan <vishnuk@google.com>
Signed-off-by: Jess Frazelle <acidburn@google.com>
@jessfraz jessfraz force-pushed the automated-cherry-pick-of-#35721-#35717-origin-release-1.4 branch from 4447995 to 766e995 Compare October 28, 2016 17:57
@jessfraz jessfraz added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed cla: no labels Oct 28, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 28, 2016
@jessfraz jessfraz added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Oct 28, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 766e995. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit 766e995. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 922d1c2 into kubernetes:release-1.4 Oct 28, 2016
@jessfraz jessfraz deleted the automated-cherry-pick-of-#35721-#35717-origin-release-1.4 branch October 28, 2016 20:44
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@pires
Copy link
Contributor

pires commented Oct 28, 2016

Yes, Google, you can have my commit! I hope you take it with some salt 😹

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#35804 from jessfraz/automated-cherry-pi…
ac3757b 
…ck-of-#35721-kubernetes#35717-origin-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#35721 kubernetes#35717

Cherry pick of kubernetes#35721 kubernetes#35717 on release-1.4.

kubernetes#35721: Fixes PR kubernetes#35652
kubernetes#35717: update rkt to v1.18.0 which avoids outputting debug
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jessfraz jessfraz

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jessfraz @googlebot @k8s-github-robot @k8s-ci-robot @k8s-cherrypick-bot @pires @vishh